Autogenerated HTML docs for v1.6.1-265-g9a013
diff --git a/git-am.html b/git-am.html index 4ffd397..15dbeb9 100644 --- a/git-am.html +++ b/git-am.html
@@ -323,7 +323,7 @@ <div class="verseblock"> <div class="content"><em>git am</em> [--signoff] [--keep] [--utf8 | --no-utf8] [--3way] [--interactive] - [--whitespace=<option>] [-C<n>] [-p<n>] + [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] [<mbox> | <Maildir>…] <em>git am</em> (--skip | --resolved | --abort)</div></div> </div> @@ -412,19 +412,15 @@ <dt> --whitespace=<option> </dt> -<dd> -<p> - This flag is passed to the <em>git-apply</em> (see <a href="git-apply.html">git-apply(1)</a>) - program that applies - the patch. -</p> -</dd> <dt> -C<n> </dt> <dt> -p<n> </dt> +<dt> +--directory=<dir> +</dt> <dd> <p> These flags are passed to the <em>git-apply</em> (see <a href="git-apply.html">git-apply(1)</a>) @@ -573,7 +569,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-12-10 08:33:07 UTC +Last updated 2009-01-22 03:38:31 UTC </div> </div> </body>
diff --git a/git-am.txt b/git-am.txt index b9c6fac..5cbbe76 100644 --- a/git-am.txt +++ b/git-am.txt
@@ -11,7 +11,7 @@ [verse] 'git am' [--signoff] [--keep] [--utf8 | --no-utf8] [--3way] [--interactive] - [--whitespace=<option>] [-C<n>] [-p<n>] + [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] [<mbox> | <Maildir>...] 'git am' (--skip | --resolved | --abort) @@ -60,12 +60,9 @@ available locally. --whitespace=<option>:: - This flag is passed to the 'git-apply' (see linkgit:git-apply[1]) - program that applies - the patch. - -C<n>:: -p<n>:: +--directory=<dir>:: These flags are passed to the 'git-apply' (see linkgit:git-apply[1]) program that applies the patch.
diff --git a/git-diff-tree.html b/git-diff-tree.html index 4cb26f7..313e4a0 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html
@@ -1281,6 +1281,11 @@ </li> <li> <p> +<em>%C(…)</em>: color specification, as described in color.branch.* config option +</p> +</li> +<li> +<p> <em>%m</em>: left, right or boundary mark </p> </li> @@ -1906,7 +1911,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-01-13 16:47:27 UTC +Last updated 2009-01-22 03:38:31 UTC </div> </div> </body>
diff --git a/git-log.html b/git-log.html index 3abf7e4..88edb3d 100644 --- a/git-log.html +++ b/git-log.html
@@ -1982,6 +1982,11 @@ </li> <li> <p> +<em>%C(…)</em>: color specification, as described in color.branch.* config option +</p> +</li> +<li> +<p> <em>%m</em>: left, right or boundary mark </p> </li> @@ -2350,7 +2355,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-01-13 16:47:29 UTC +Last updated 2009-01-22 03:38:31 UTC </div> </div> </body>
diff --git a/git-push.html b/git-push.html index 4f76b7b..dd84101 100644 --- a/git-push.html +++ b/git-push.html
@@ -342,7 +342,9 @@ <dd> <p> The "remote" repository that is destination of a push - operation. See the section <a href="#URLS">GIT URLS</a> below. + operation. This parameter can be either a URL + (see the section <a href="#URLS">GIT URLS</a> below) or the name + of a remote (see the section <a href="#REMOTES">REMOTES</a> below). </p> </dd> <dt> @@ -360,18 +362,17 @@ tip of <tt>master</tt> branch); see <a href="git-rev-parse.html">git-rev-parse(1)</a>) that you want to push. The <dst> side represents the destination location.</p></div> <div class="para"><p>The local ref that matches <src> is used -to fast forward the remote ref that matches <dst> (or, if no <dst> was -specified, the same ref that <src> referred to locally). If +to fast forward the remote ref that matches <dst>. If the optional leading plus <tt>+</tt> is used, the remote ref is updated even if it does not result in a fast forward update.</p></div> <div class="para"><p><tt>tag <tag></tt> means the same as <tt>refs/tags/<tag>:refs/tags/<tag></tt>.</p></div> -<div class="para"><p>A parameter <ref> without a colon pushes the <ref> from the source -repository to the destination repository under the same name.</p></div> +<div class="para"><p>A lonely <src> parameter (without a colon and a destination) pushes +the <src> to the same name in the destination repository.</p></div> <div class="para"><p>Pushing an empty <src> allows you to delete the <dst> ref from the remote repository.</p></div> <div class="para"><p>The special refspec <tt>:</tt> (or <tt>+:</tt> to allow non-fast forward updates) -directs git to push "matching" heads: for every head that exists on -the local side, the remote side is updated if a head of the same name +directs git to push "matching" branches: for every branch that exists on +the local side, the remote side is updated if a branch of the same name already exists on the remote side. This is the default operation mode if no explicit refspec is found (that is neither on the command line nor in any Push line of the corresponding remotes file---see below).</p></div> @@ -832,7 +833,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-01-12 18:04:12 UTC +Last updated 2009-01-22 03:38:32 UTC </div> </div> </body>
diff --git a/git-push.txt b/git-push.txt index 3321966..7b27dc6 100644 --- a/git-push.txt +++ b/git-push.txt
@@ -28,7 +28,9 @@ ------- <repository>:: The "remote" repository that is destination of a push - operation. See the section <<URLS,GIT URLS>> below. + operation. This parameter can be either a URL + (see the section <<URLS,GIT URLS>> below) or the name + of a remote (see the section <<REMOTES,REMOTES>> below). <refspec>...:: The canonical format of a <refspec> parameter is @@ -42,22 +44,21 @@ want to push. The <dst> side represents the destination location. + The local ref that matches <src> is used -to fast forward the remote ref that matches <dst> (or, if no <dst> was -specified, the same ref that <src> referred to locally). If +to fast forward the remote ref that matches <dst>. If the optional leading plus `+` is used, the remote ref is updated even if it does not result in a fast forward update. + `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`. + -A parameter <ref> without a colon pushes the <ref> from the source -repository to the destination repository under the same name. +A lonely <src> parameter (without a colon and a destination) pushes +the <src> to the same name in the destination repository. + Pushing an empty <src> allows you to delete the <dst> ref from the remote repository. + The special refspec `:` (or `+:` to allow non-fast forward updates) -directs git to push "matching" heads: for every head that exists on -the local side, the remote side is updated if a head of the same name +directs git to push "matching" branches: for every branch that exists on +the local side, the remote side is updated if a branch of the same name already exists on the remote side. This is the default operation mode if no explicit refspec is found (that is neither on the command line nor in any Push line of the corresponding remotes file---see below).
diff --git a/git-rev-list.html b/git-rev-list.html index b22a19c..765b424 100644 --- a/git-rev-list.html +++ b/git-rev-list.html
@@ -1565,6 +1565,11 @@ </li> <li> <p> +<em>%C(…)</em>: color specification, as described in color.branch.* config option +</p> +</li> +<li> +<p> <em>%m</em>: left, right or boundary mark </p> </li> @@ -1621,7 +1626,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-01-13 16:47:30 UTC +Last updated 2009-01-22 03:38:32 UTC </div> </div> </body>
diff --git a/git-show.html b/git-show.html index 97da5ae..941ae32 100644 --- a/git-show.html +++ b/git-show.html
@@ -682,6 +682,11 @@ </li> <li> <p> +<em>%C(…)</em>: color specification, as described in color.branch.* config option +</p> +</li> +<li> +<p> <em>%m</em>: left, right or boundary mark </p> </li> @@ -855,7 +860,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-01-13 16:47:30 UTC +Last updated 2009-01-22 03:38:32 UTC </div> </div> </body>
diff --git a/git-whatchanged.html b/git-whatchanged.html index f065444..a0826fa 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html
@@ -714,6 +714,11 @@ </li> <li> <p> +<em>%C(…)</em>: color specification, as described in color.branch.* config option +</p> +</li> +<li> +<p> <em>%m</em>: left, right or boundary mark </p> </li> @@ -794,7 +799,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-01-13 16:47:30 UTC +Last updated 2009-01-22 03:38:33 UTC </div> </div> </body>
diff --git a/pretty-formats.txt b/pretty-formats.txt index 0a8a948..3d87d3e 100644 --- a/pretty-formats.txt +++ b/pretty-formats.txt
@@ -124,6 +124,7 @@ - '%Cgreen': switch color to green - '%Cblue': switch color to blue - '%Creset': reset color +- '%C(...)': color specification, as described in color.branch.* config option - '%m': left, right or boundary mark - '%n': newline - '%x00': print a byte from a hex code
diff --git a/technical/api-run-command.html b/technical/api-run-command.html index e11cd5f..9de8601 100644 --- a/technical/api-run-command.html +++ b/technical/api-run-command.html
@@ -385,6 +385,25 @@ started with start_async(). </p> </dd> +<dt> +<tt>run_hook</tt> +</dt> +<dd> +<p> + Run a hook. + The first argument is a pathname to an index file, or NULL + if the hook uses the default index file or no index is needed. + The second argument is the name of the hook. + The further arguments correspond to the hook arguments. + The last argument has to be NULL to terminate the arguments list. + If the hook does not exist or is not executable, the return + value will be zero. + If it is executable, the hook will be executed and the exit + status of the hook is returned. + On execution, .stdout_to_stderr and .no_stdin will be set. + (See below.) +</p> +</dd> </dl></div> </div> <h2 id="_data_structures">Data structures</h2> @@ -612,7 +631,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-12-10 08:33:40 UTC +Last updated 2009-01-22 03:38:33 UTC </div> </div> </body>
diff --git a/technical/api-run-command.txt b/technical/api-run-command.txt index 82e9e83..2efe7a4 100644 --- a/technical/api-run-command.txt +++ b/technical/api-run-command.txt
@@ -52,6 +52,21 @@ Wait for the completion of an asynchronous function that was started with start_async(). +`run_hook`:: + + Run a hook. + The first argument is a pathname to an index file, or NULL + if the hook uses the default index file or no index is needed. + The second argument is the name of the hook. + The further arguments correspond to the hook arguments. + The last argument has to be NULL to terminate the arguments list. + If the hook does not exist or is not executable, the return + value will be zero. + If it is executable, the hook will be executed and the exit + status of the hook is returned. + On execution, .stdout_to_stderr and .no_stdin will be set. + (See below.) + Data structures ---------------
